# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
# ChangeSet 1.676.14.37 -> 1.676.14.38
# Documentation/Configure.help 1.128.5.2 -> 1.128.5.3
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 02/09/27 bjorn_helgaas@hp.com 1.676.14.38
# config documentation updates.
# --------------------------------------------
#
diff -Nru a/Documentation/Configure.help b/Documentation/Configure.help
--- a/Documentation/Configure.help Wed Oct 8 09:07:34 2003
+++ b/Documentation/Configure.help Wed Oct 8 09:07:34 2003
@@ -15737,12 +15737,6 @@
were partitioned using EFI GPT. Presently only useful on the
IA-64 platform.
-/dev/guid support (EXPERIMENTAL)
-CONFIG_DEVFS_GUID
- Say Y here if you would like to access disks and partitions by
- their Globally Unique Identifiers (GUIDs) which will appear as
- symbolic links in /dev/guid.
-
Ultrix partition table support
CONFIG_ULTRIX_PARTITION
Say Y here if you would like to be able to read the hard disk
@@ -25054,14 +25048,18 @@
As of the time of this writing, most hardware is DIG compliant,
so the "DIG-compliant" option is usually the right choice.
- HP-simulator For the HP simulator
- ().
+ HP-simulator For the HP simulator ().
+ HP-zx1 For HP zx1 Platforms.
SN1 For SGI SN1 Platforms.
SN2 For SGI SN2 Platforms.
- DIG-compliant For DIG ("Developer's Interface Guide") compliant
- system.
+ DIG-compliant For DIG ("Developer's Interface Guide") compliant systems.
If you don't know what to do, choose "generic".
+
+CONFIG_IA64_HP_ZX1
+ Build a kernel that runs on HP zx1-based systems. This adds support
+ for the zx1 IOMMU and makes root bus bridges appear in PCI config space
+ (required for zx1 agpgart support).
CONFIG_IA64_SGI_SN_SIM
Build a kernel that runs on both the SGI simulator AND on hardware.